Handle views with an invalid filename
Merge branch 'master' into ST3