Merge upstream changes to manjaroiso