Merge branch 'master' into renaming
Tidy up stats loop comments
Merge branch 'renaming'