Merge branch 'master' into mattl-cc0-fi