BUGFIX: Driver checks for multiple modules attached to the same device
Merge remote-tracking branch 'origin/master'