Merge tag 'v2.12.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 May 2019 19:28:40 +0000 (15:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 May 2019 19:28:40 +0000 (15:28 -0400)
Version 2.12.2


Trivial merge