Merge branch 'master' of git://nbd.name/uci