version bump
merge with 1.2.x