Merge branch 'MDL-27387_rating_scale_validation_master2' of git://github.com/andyjdav...