Merge branch 'webdav-locking-milton2' into webdav-locking