Merge pull request #1000 from solgenomics/topic/handle_exisiting_cross_folders