Merge branch 'release/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Dec 2018 13:30:13 +0000 (08:30 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Dec 2018 13:30:13 +0000 (08:30 -0500)

Trivial merge