Merging in upstream changes
Merging in upstream changes

cozy/jsDAV,clochix/jsDAV,9590/jsDAV,jsilvestre/jsDAV,Mailden/jsDAV-original,WigWagCo/jsDAV,Mailden/jsDAV-original,mikedeboer/jsDAV,WigWagCo/jsDAV,mnutt/jsDAV,mikedeboer/jsDAV,arcana261/jsDAV,arcana261/jsDAV,cozy/jsDAV,mnutt/jsDAV,jsilvestre/jsDAV,9590/jsDAV,clochix/jsDAV