Merge branch 'dirview'