Merge remote-tracking branch 'master/master' into jordibgzashtita

CHANGELOG.md

build.gradle

fastlane/metadata/android/en-US/changelogs/4214004.txt

fastlane/metadata/android/it-IT/changelogs/4214004.txt

fastlane/metadata/android/uk/changelogs/4214004.txt

fastlane/metadata/android/zh-CN/changelogs/4214004.txt

...ain/java/eu/siacs/conversations/parser/MessageParser.java

src/main/java/eu/siacs/conversations/xml/Element.java

...ain/java/eu/siacs/conversations/xml/LocalizedContent.java

src/main/java/eu/siacs/conversations/xml/XmlReader.java

...a/im/conversations/android/xmpp/model/stanza/Message.java

src/main/res/values-es/strings.xml