Merge branch 'hotfix/1.1.25' v1.1.25
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Sep 2017 21:02:13 +0000 (17:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Sep 2017 21:02:13 +0000 (17:02 -0400)

Trivial merge