Merge pull request #1735 from shackbarth/fairgame