Merging some stuff from branch 'archlinux'