Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 27 Jul 2018 19:30:47 +0000 (15:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 27 Jul 2018 19:30:47 +0000 (15:30 -0400)

Trivial merge