Change arch any to all
Merge remote-tracking branch 'upstream/master' into kaji