Upstream version 4.2-build2010