The same changes
Merge branch 'master' of https://github.com/Prot-On/owncloud_proton_common
Merge branch 'master' of https://github.com/Prot-On/owncloud_proton_common