Merge branch 'MDL-36415-master-int' of git://github.com/FMCorz/moodle