Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Sep 2017 20:16:11 +0000 (16:16 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Sep 2017 20:16:11 +0000 (16:16 -0400)

Trivial merge