Merge branch 'hotfix/1.1.6' v1.1.6
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:11 +0000 (15:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 Aug 2016 19:12:11 +0000 (15:12 -0400)

Trivial merge