Merge branch 'MDL-30518' of git://github.com/mackensen/moodle