Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 21:27:58 +0000 (17:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 21:27:58 +0000 (17:27 -0400)

Trivial merge