+ integrate Grizzly 2.3.11
Merge pull request #772 from oleksiys/master

+ integrate Grizzly 2.3.11