Fix for rebased objective-git branch