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