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