Merge branch 'hotfix_or_in_span'
article url as text field
Merge branch 'hotfix_url_as_text' into dev