Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:41:17 +0000 (09:41 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jul 2016 13:41:17 +0000 (09:41 -0400)
v1.0.25


Trivial merge