Merge branch 'hotfix/1.0.34' v1.0.34
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Jun 2017 18:38:23 +0000 (14:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 7 Jun 2017 18:38:23 +0000 (14:38 -0400)

Trivial merge