Merge branch 'master' into merge-8.0
Merge branch 'merge-8.0' of github.com:olofsvensson/dawn-product into merge-8.0