Upstream update to 1.6.0