Merge branch 'da/pretty-tempname'