Allow multiple MessageSources that are comma separated.

Fixes gh-532, Fixes gh-506