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

Trivial merge