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