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