Fixed bug 2673
Speculative fix for bug 2667.
Merge branch 'master' of github.com:sk89q/commandhelper.git