Stupid warnings.
Merge branch 'master' of github.com:starmoth/starmoth into GL3