License and copyrights.
Merge branch 'master' into v0.11