Merge tag 'v1.6.98' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 29 Aug 2018 20:44:08 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 29 Aug 2018 20:44:08 +0000 (16:44 -0400)
v1.6.98


Trivial merge