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