Merge "Allow folders to be copied into Downloads." into oc-dev