Sync with Debian svn 20201 for upload based on 3.9.4-1