Update to latest mc upstream

This includes our patch.