Merge branch 'hotfix/1.1.11' v1.1.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 13:34:54 +0000 (09:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 13:34:54 +0000 (09:34 -0400)

Trivial merge