Upstream commit for Bluetooth

See #9 for description

Not tested by me.