Merge branch 'hotfix/1.0.29' v1.0.29
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 May 2017 20:31:06 +0000 (16:31 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 May 2017 20:31:06 +0000 (16:31 -0400)

Trivial merge