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

Trivial merge