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