Ignored tilde backup files
Merged from master