Merge branch 'master' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 5 Aug 2019 13:22:08 +0000 (09:22 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 5 Aug 2019 13:22:08 +0000 (09:22 -0400)

Trivial merge