1.1.2 prep
Merge pull request #240 from mhaskel/1.1.2-prep

1.1.2 prep