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

Trivial merge