Merge branch 'hotfix/1.1.2'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:45:23 +0000 (08:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:45:23 +0000 (08:45 -0500)

Trivial merge