CONTRIB-4865 use standard Moodle 2.6 name fields
Merge remote-tracking branch 'upstream/master'