Merge paul

Signed-off-by: Justin Lecher <jlec@gentoo.org>