Merge tag 'v1.1.25' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:56:58 +0000 (09:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:56:58 +0000 (09:56 -0400)
v1.1.25


Trivial merge