Comment 50 for bug 1202952

Grizzly - bug-1202952-grizzly-v3.patch from comment #49
- unit tests worked - Ran 1306 tests in 2366.276s
- visual inspection looks good, my comment was addressed
= +2