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