weekly release 2.6dev
Merge remote-tracking branch 'moodle/master'