Merge branch 'DanielG-dev-flash-addressing'

Conflicts:
	host/libraries/libbladeRF/src/backend/libusb.c