Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Aug 2018 19:40:33 +0000 (15:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Aug 2018 19:40:33 +0000 (15:40 -0400)

Trivial merge