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