Merge branch '2832_mcedit_safe_save' into 4.8.1-stable