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