Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle