Support the use of the JIRA status as the TODO tag value
Merge branch 'jeremy-compostella-master'