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