Merge branch 'bt-fix' (bluetooth fixes from Marcel)