[aur-general] Merge stjerm in stjerm-git