Incorporate DBAL PR#247.
Minor cleanup.
Pass custom option.
Use dev-master for dev.