merge archlinuxarm:master changes with my fork