Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Fri, 27 Jul 2018 19:13:08 +0000 (15:13 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 27 Jul 2018 19:13:08 +0000 (15:13 -0400)

Trivial merge