Merge branch 'MDL-30192' of git://github.com/stronk7/moodle