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