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