Simplified to use @{upstream} instead of branch detection. Moved changelog entry to [Unreleased]. Closes #961