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