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