Merge branch '3898_mcedit_save_files'