Upstream merge, patch #6 no longer required (remove whitespace from minecraft ping)