Complete NoMovesExceptions
Merge branch 'NoMovesExceptionsBranch'