Merge branch 'release/2.12.4' v2.12.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jun 2019 20:17:02 +0000 (16:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jun 2019 20:17:02 +0000 (16:17 -0400)

Trivial merge