Fixes dashboard issues
Merge pull request #102 from git-harry/grizzly

Merged automatically by jenkins after successful build test