Merge branch 'MDL-41117_master' of git://github.com/kordan/moodle