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