Upstream version 1.34