Merge branch 'release/2.12.5' v2.12.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 16:13:21 +0000 (12:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 16:13:21 +0000 (12:13 -0400)

Trivial merge