Features/extract issue tracker merge master

Bring errbit:features/extract_issue_tracker up to date with errbit:master