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