kittens all the time!
merge branch 'master' into gh-pages.