Merge branch 'wip-MDL-61163-master' of git://github.com/marinaglancy/moodle