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