Merge branch 'calin' of https://github.com/squirrly/squirrly-seo.git into calin