Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:39:18 +0000 (08:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Sep 2017 12:39:18 +0000 (08:39 -0400)

Trivial merge