*grumble*
Merge commit '0cc33d5e2fc24490b96a28a675553fd577fa907b'
stuff
Merge branch 'master' into gh-pages