Merge remote-tracking branch 'origin/master' into develop

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

# Conflicts:
#	Nextcloud.xcodeproj/project.pbxproj