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