GH #201 - API keys fixes.
Merge branch 'master' into support/2.0