Merge pull request #633 from rustyswayne/1.1.1

Merge to prep from 1.2.0 merge
Merge pull request #634 from rustyswayne/1.1.1

Missed files