Merge branch 'apid_displayname' of github.com:30x/apid into apid_displayname