Merge changes from armagetronad to armagetronad-dedicated