Merge branch 'hotfix/1.0.13' v1.0.13
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:39:18 +0000 (14:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Jun 2017 18:39:18 +0000 (14:39 -0400)

Trivial merge