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