Synced edit.php with master