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