Merge branch 'release/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 14:13:27 +0000 (10:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Aug 2018 14:13:27 +0000 (10:13 -0400)

Trivial merge