Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Oct 2018 15:15:33 +0000 (11:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Oct 2018 15:15:33 +0000 (11:15 -0400)

Trivial merge