Merging upstream (I think)
Don't want gentoo-specific stuff here
Merging conflicts