Merge branch 'hotfix/1.0.35' v1.0.35
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Jul 2017 19:49:52 +0000 (15:49 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 5 Jul 2017 19:49:52 +0000 (15:49 -0400)

Trivial merge