Merge branch 'release/2.12.6' v2.12.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 18:40:36 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 18:40:36 +0000 (14:40 -0400)

Trivial merge