Merge branch 'hotfix/1.0.29' v1.0.29
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 Aug 2016 12:38:55 +0000 (08:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 Aug 2016 12:38:55 +0000 (08:38 -0400)

Trivial merge