Wildignore www
Merge branch 'master' into macosx