Merge pull request #230 from t-b/backport_webdav_hotfix

Backport fixes from 2.0.x maintance releases