Merge branch 'MDL-67874-master' of git://github.com/bmbrands/moodle