Merge branch 'hotfix/1.1.2' v1.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Aug 2017 17:32:32 +0000 (13:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Aug 2017 17:32:32 +0000 (13:32 -0400)

Trivial merge