Merge branch 'MDL-65412-master' of http://github.com/dravek/moodle