Merge branch 'master' into www

Conflicts:
README.md