Sync with mcedit unified changes

Oops, forgot, sorry.