update to 1.2-9-g085af23