Merge pull request #321 from mancdaz/grizzly

Merged automatically by jenkins after successful build test