update to 1.2-50-g4939ed2