JBTM-1600 4_BRANCH doesn't use upstream
Merge pull request #261 from tomjenkinson/JBTM-1600

JBTM-1600 4_BRANCH doesn't use upstream