Merge tag 'v1.6.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 19:26:11 +0000 (15:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 19:26:11 +0000 (15:26 -0400)
v1.6.4


Trivial merge