Merge pull request #672 from rustyswayne/master

Merge 1.2.0 pre-release