fix z-index on ribbon
Merge branch 'master' into gh-pages