Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:35:22 +0000 (08:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:35:22 +0000 (08:35 -0400)

Trivial merge