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