Fix dependency issues.
Merge remote-tracking branch 'origin/master' into webdav
Correcting os-ports syntax and including a forgotten migration