Merge branch 'release/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Aug 2018 17:26:59 +0000 (13:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Aug 2018 17:26:59 +0000 (13:26 -0400)

Trivial merge