Upstream version 1.42