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