Merge branch 'hotfix/1.0.16' v1.0.16
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 10 Sep 2018 20:00:56 +0000 (16:00 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 10 Sep 2018 20:00:56 +0000 (16:00 -0400)

Trivial merge