Merge remote-tracking branch 'origin/jb-mr1' into jb-mr1-bluez-mod
Merge remote-tracking branch 'medipad/jb-mr1-bluez-mod' into jb-mr1-bluez-mod