Merge branch 'hotfix/1.7.22' v1.7.22
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 21 Mar 2019 13:44:09 +0000 (09:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 21 Mar 2019 13:44:09 +0000 (09:44 -0400)

Trivial merge