Merge branch 'hotfix/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Sep 2018 16:15:57 +0000 (12:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Sep 2018 16:15:57 +0000 (12:15 -0400)

Trivial merge