Auto complete feature/release/hotfix branches in git flow.
Merge remote-tracking branch 'origin/master' into viper