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