Merge pull request #429 from mhaskel/1.2.x-ff

1.2.x ff
1.2.0 prep
Merge pull request #431 from mhaskel/1.2.0-prep

1.2.0 prep
Merge remote-tracking branch 'upstream/1.2.x' into test
Merge pull request #432 from mhaskel/test

Merge 1.2.x into master