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