Merge branch 'hotfix/1.7.21' v1.7.21
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Feb 2019 13:40:33 +0000 (08:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Feb 2019 13:40:33 +0000 (08:40 -0500)

Trivial merge