Merge branch 'release/1.1.22' v1.1.22
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Dec 2017 19:16:31 +0000 (14:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Dec 2017 19:16:31 +0000 (14:16 -0500)

Trivial merge