Merge branch 'master' into east825/tasks-configurable-issue-states