linked to giraffe dashboard config
Merge branch 'master' into gh-pages