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