Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 20:30:19 +0000 (16:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 20:30:19 +0000 (16:30 -0400)

Trivial merge