Merge pull request #537 from cbodley/wip-iam-user-apis