Merge branch 'release/1.0.22' v1.0.22
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Aug 2018 20:38:21 +0000 (16:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Aug 2018 20:38:21 +0000 (16:38 -0400)

Trivial merge