commit merge
Merge branch 'develop-merge' of github.com:cgkineo/adapt-contrib-assessment into develop-merge