Merge branch 'MDL-51327-master' of git://github.com/mihailges/moodle