Merge branch 'release/2.12.7' v2.12.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Jul 2019 12:44:05 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Jul 2019 12:44:05 +0000 (08:44 -0400)

Trivial merge