update to 1.2-30-g6712002