@WalterBright Are you merging master into your branches or rebasing your branches on top of master?  I've had problems like this with the former.