Merge branch 'hotfix/1.1.7' v1.1.7
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:47 +0000 (16:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 20:56:47 +0000 (16:56 -0400)

Trivial merge