only track current branch and ignore others
Merge branch 'develop' into feature-wheezy