accept source, move SOURCE_ to PROVIDER_ (bug 921188)
Merge pull request #137 from andymckay/921188

accept source, move SOURCE_ to PROVIDER_ (bug 921188)