Merge branch 'hotfix/2.5.10' v2.5.10
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 17:14:09 +0000 (13:14 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 17:14:09 +0000 (13:14 -0400)

Trivial merge