update to 1.2-46-g63b0e58