Updated origin validation (bug 892604)
Merge pull request #11 from robhudson/892604-origin-validation

Updated origin validation (bug 892604)