Ensure a view with filename is on disk
Merge branch 'master' into ST3