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