Merge branch 'hotfix/1.1.2' v1.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 15:27:22 +0000 (10:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 15:27:22 +0000 (10:27 -0500)

Trivial merge