Merge branch '4562_mcedit_macros_paste'