Merge branch 'hotfix/1.1.15' v1.1.15
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:24:29 +0000 (14:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:24:29 +0000 (14:24 -0400)

Trivial merge