Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle