Strip out 'www' from canonical
Merge branch 'dev'