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

1.2.0 prep
Merge pull request #136 from mhaskel/merge_1.2.x

Merge 1.2.x