Merge in /newtree. 20% done

Having a backup upstream would be nice.