Merge branch 'release/2.12.1' v2.12.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Apr 2019 17:43:29 +0000 (13:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Apr 2019 17:43:29 +0000 (13:43 -0400)

Trivial merge