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