Merge branch 'hotfix/1.6.4' master v1.6.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 19:26:06 +0000 (15:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 19:26:06 +0000 (15:26 -0400)

Trivial merge