Merge branch 'release/4.2.0' master v4.2.0
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Oct 2019 13:34:46 +0000 (09:34 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Oct 2019 13:34:46 +0000 (09:34 -0400)

Trivial merge