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