Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:04 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 19:15:04 +0000 (14:15 -0500)
v1.0.25


Trivial merge