Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Jun 2017 12:40:12 +0000 (08:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Jun 2017 12:40:12 +0000 (08:40 -0400)

Trivial merge