Avoid prepending "Server -!- " to messages sent using the command block.
Merge remote-tracking branch 'refs/remotes/origin/master'