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