Merge tag 'v2.0.26' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:19:19 +0000 (15:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 19:19:19 +0000 (15:19 -0400)
v2.0.26


Trivial merge