Fixed really slow hand-entered-moves crashing bug.
Merge branch 'refs/heads/rob' into alden