MADNESS. I TELLS YOU.
Merge branch 'master' into gh-pages