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