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