Merge tag 'v2.5.8' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 11 Apr 2018 14:42:19 +0000 (10:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 11 Apr 2018 14:42:19 +0000 (10:42 -0400)
v2.5.8


Trivial merge