Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 17:25:03 +0000 (12:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 17:25:03 +0000 (12:25 -0500)

Trivial merge