Git: spice things up with some notbads
Merge branch 'master' into gh-pages