Merge branch 'release/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Apr 2018 12:30:34 +0000 (08:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Apr 2018 12:30:34 +0000 (08:30 -0400)

Trivial merge