Merge branch 'hotfix/1.1.9' v1.1.9
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:32:46 +0000 (16:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:32:46 +0000 (16:32 -0400)

Trivial merge