Merge pull request #2111 from bollwyvl/source-url-can-be-list

Merge pull request #2111 from bollwyvl/source-url-can-be-list #2219