removed shrink-wrapping, was causing a bump in the status line
Merge branch 'master' into gh-pages