Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 20:33:39 +0000 (16:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 20:33:39 +0000 (16:33 -0400)

Trivial merge