Merge tag 'v2.12.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Apr 2019 17:43:36 +0000 (13:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Apr 2019 17:43:36 +0000 (13:43 -0400)
Version 2.12.1


Trivial merge