Merge pull request #101 from git-harry/grizzly

Merged automatically by jenkins after successful build test
Fixes dashboard issues