Import database/sql rev a8a6e765d6a8
Merge branch 'upstream'