Merge branch 'wip-MDL-40343-master' of git://github.com/ds125v/moodle