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