Merge branch 'master' into branch-1.8
[fw/altos] / contrib /
drwxr-xr-x   ..
drwxr-xr-x - arch-linux