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