Checks stats to make sure that they are addable to get an avg.
Merge branches 'master' and 'develop'