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