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