1.1.2-prep.
Merge pull request #120 from mhaskel/1.1.2-prep

1.1.2-prep.
Prepare a 1.1.3 release.
Merge pull request #121 from apenney/113-release

Prepare a 1.1.3 release.
Merge remote-tracking branch 'upstream/1.1.x' into test
Merge pull request #127 from mhaskel/1.1.x-merged-into-master

1.1.x merged into master