Merge mc-commands.js from master