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