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