Merge tag 'v1.1.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:07:45 +0000 (15:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 20:07:45 +0000 (15:07 -0500)
v1.1.25


Trivial merge