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