Oops, should have been a generic has
Merge branch 'master' into gh-pages