Merge tag 'v2.12.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 16:13:28 +0000 (12:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 16:13:28 +0000 (12:13 -0400)
Version 2.12.5


Trivial merge