Merge branch '0.1.4'
Merge branch 'basesql_retries'
oops, 10, not -10 tries.
Merge branch '0.1.3'
Merge branch 'master' into 0.1.4