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