Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:06:40 +0000 (12:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:06:40 +0000 (12:06 -0400)

Trivial merge