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