Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Sep 2018 12:34:32 +0000 (08:34 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Sep 2018 12:34:32 +0000 (08:34 -0400)

Trivial merge