Merge in 'davtest'.

We had to pull in three dependencies for this package.