Merge branch 'hotfix/2.5.7' v2.5.7
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Apr 2018 18:33:20 +0000 (14:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Apr 2018 18:33:20 +0000 (14:33 -0400)

Trivial merge