Merge branch 'hotfix/1.0.15' v1.0.15
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 28 Aug 2018 15:09:58 +0000 (11:09 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 28 Aug 2018 15:09:58 +0000 (11:09 -0400)

Trivial merge