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