Merge branch 'dev'
final tweak to publish Web Servers for Web Edition