Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:38 +0000 (14:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:38 +0000 (14:29 -0400)

Trivial merge