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