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