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