Updated to 1.1.2
Merge pull request #2392 from fraywing/master

Updated to 1.1.2