Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 13:02:20 +0000 (08:02 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Jan 2018 13:02:20 +0000 (08:02 -0500)

Trivial merge