Merge branch 'hotfix/1.0.29' v1.0.29
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Oct 2018 19:12:54 +0000 (15:12 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 10 Oct 2018 19:12:54 +0000 (15:12 -0400)

Trivial merge