Merge branch 'hotfix/1.1.11' v1.1.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 12 Sep 2018 17:14:39 +0000 (13:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 12 Sep 2018 17:14:39 +0000 (13:14 -0400)

Trivial merge