Upstream merge - fix minecraft_status patch