Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle