Upstream version 1.80