Merge branch 'hotfix/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 6 Jun 2019 19:14:44 +0000 (15:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 6 Jun 2019 19:14:44 +0000 (15:14 -0400)

Trivial merge