Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle