merged for gitflow plugin