Merge branch 'hotfix/1.1.8' v1.1.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:31:04 +0000 (16:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Apr 2016 20:31:04 +0000 (16:31 -0400)

Trivial merge