Merge branch 'hotfix/1.1.7' v1.1.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:54:41 +0000 (14:54 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:54:41 +0000 (14:54 -0400)

Trivial merge