Changed upstream version to 1.8.5