Merge tag 'v1.1.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Sep 2017 21:02:18 +0000 (17:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Sep 2017 21:02:18 +0000 (17:02 -0400)
v1.1.25


Trivial merge