Update to dev for 2.6.0.
Merge branch 'master' into db
Simplify db drone code.