Merge branch 'search-3.2.0' of git.rot13.org:/git/BackupPC into search-3.2.0