Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle