Merge branch 'hotfix/1.2.17' v1.2.17
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 21:57:50 +0000 (16:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 21:57:50 +0000 (16:57 -0500)

Trivial merge