Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:53:03 +0000 (13:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 17:53:03 +0000 (13:53 -0400)

Trivial merge