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