Merge branch 'hotfix/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Mar 2017 14:15:50 +0000 (10:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Mar 2017 14:15:50 +0000 (10:15 -0400)

Trivial merge