Merge tag 'v2.12.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 18:40:43 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jul 2019 18:40:43 +0000 (14:40 -0400)
Version 2.12.6


Trivial merge