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