Merge branch '2957_mcedit_broken_autocompletion'