Upstream version 1.8.2