Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Mon, 1 Aug 2016 12:43:20 +0000 (08:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 1 Aug 2016 12:43:20 +0000 (08:43 -0400)

Trivial merge