Imported from debian svn r15120