Merging rcarz/jira-client changes to my branch.