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