Adds or_contains condition to UrlConditionBuilder
Merge branch 'origin/master'