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