fix for Jenkins branch handling
Merge branch 'develop' into feature-wheezy