Automated merge with https://code.gocept.com/hg/public/zeit.content.article
Automated merge with https://code.gocept.com/hg/public/zeit.content.article

ZeitOnline/zeit.content.article,ZeitOnline/zeit.content.article,ZeitOnline/zeit.content.article