Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 May 2018 15:51:32 +0000 (11:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 May 2018 15:51:32 +0000 (11:51 -0400)

Trivial merge