Merge 29-clean-built-sources.patch