Merge branch 'master' into tree-router