Merge branch 'vegard' into docs-mw