Print file name as information
Merge branch 'master' into cleanprog-mitya

Remaining change: unconditionally enable fancy output.