Merge tag 'v1.0.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:29 +0000 (16:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Jan 2017 21:22:29 +0000 (16:22 -0500)
v1.0.25


Trivial merge