Properly extract org and username from taskd.credentials.
Merge branch 'development'