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