Merge tag 'v2.5.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 5 Apr 2018 18:33:26 +0000 (14:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 5 Apr 2018 18:33:26 +0000 (14:33 -0400)
v2.5.7


Trivial merge