Missing /branch/ files

From the v1.6 branch to here.