Merge branch 'MDL-33212-m22' of git://github.com/sammarshallou/moodle into MOODLE_22_...