Merge branch 'MDL-61343-master' of git://github.com/Kathrin84/moodle