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

Trivial merge