Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 1 Oct 2015 20:59:00 +0000 (16:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 1 Oct 2015 20:59:00 +0000 (16:59 -0400)
v1.0.25


Trivial merge