Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:42 +0000 (14:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:29:42 +0000 (14:29 -0400)
v1.0.25


Trivial merge