rolled in my JIRA and GAE changes from the V1 API