Update to latest upstream version, add support for multibit switch names