Merge branch 'hotfix/1.6.2' v1.6.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:54:39 +0000 (12:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 16:54:39 +0000 (12:54 -0400)

Trivial merge