Merge git://github.com/darchon/clash into cλash