Merge branch 'master' into feature/9257_ccl_performance
refs #9257. The way that logging works has changed.
Merge branch 'feature/9257_ccl_performance' into develop