Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Aug 2016 20:44:05 +0000 (16:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Aug 2016 20:44:05 +0000 (16:44 -0400)

Trivial merge