Merge "shell.php: prevent permission error"