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