Merge branch 'hotfix/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Apr 2018 14:21:14 +0000 (10:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Apr 2018 14:21:14 +0000 (10:21 -0400)

Trivial merge