add branch.diff, fixes build on php 5.5