Merge branch 'MDL-52342-master' of git://github.com/andrewnicols/moodle