Merge branch 'hotfix/1.2.17' v1.2.17
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:28 +0000 (08:54 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 13:54:28 +0000 (08:54 -0500)

Trivial merge