update to 1.2-25-gc776e47