Merge branch 'release/1.1.15' master v1.1.15
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Oct 2019 15:12:32 +0000 (11:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Oct 2019 15:12:32 +0000 (11:12 -0400)

Trivial merge