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

Trivial merge