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