Bad merge, retrying...

-- taking changes from upstream