1.2.x ff

Bring 1.2.x up to where master is.