Merge branch 'hotfix/1.0.14' v1.0.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 6 Apr 2018 23:10:22 +0000 (19:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 6 Apr 2018 23:10:22 +0000 (19:10 -0400)

Trivial merge