Merge branch 'hotfix/1.0.34' v1.0.34
authorLaury GvR <laury@gaslightmedia.com>
Tue, 6 Dec 2016 22:07:26 +0000 (17:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 6 Dec 2016 22:07:26 +0000 (17:07 -0500)

Trivial merge