bluetooth
test 2
Merge remote-tracking branch 'origin/bluetooth' into 1.2.7

Conflicts:
	feature.txt