Merge remote-tracking branch 'hgm/www' into www