Merge tag 'v2.12.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jun 2019 20:17:11 +0000 (16:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jun 2019 20:17:11 +0000 (16:17 -0400)
Version 2.12.4


Trivial merge