Merge branch 'hotfix/1.1.25'
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:56:54 +0000 (09:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:56:54 +0000 (09:56 -0400)

Trivial merge