Update to git:bb9046a