1.2.0 prep
Merge pull request #871 from mhaskel/1.2.0-prep

1.2.0 prep