Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 19:39:01 +0000 (15:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 1 Jun 2018 19:39:01 +0000 (15:39 -0400)

Trivial merge