Merge branch 'hotfix/1.1.6' v1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:08 +0000 (10:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 14:58:08 +0000 (10:58 -0400)

Trivial merge