Merge branch 'hotfix/1.0.25' v1.0.25
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:23 +0000 (16:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:23 +0000 (16:22 -0500)

Trivial merge