Changes for rc1.
Merge pull request #343 from bjlittle/release_1p2_rc1

Changes for rc1.