Merge branch '4580_mcedit_segfault'