Merge branch 'release/2.12.2' v2.12.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 May 2019 19:28:33 +0000 (15:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 May 2019 19:28:33 +0000 (15:28 -0400)

Trivial merge