Merge branch 'master' into 117-path-rendering