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