merged manjaro changes