Merge branch 'bugfix/webfinger-xml-crash' into 'develop'