Rebase against 3.18.1

This should fix a problem with the driver not finding any access points

Refs #58