Merge branch 'master' into devel

This commit is contained in:
Jose M 2020-05-06 15:17:15 +02:00
commit cd6f05097b
No known key found for this signature in database
GPG Key ID: 790179D6924E10FF

@ -1 +0,0 @@
Subproject commit a20574168fedf0c3a69116866fc0d1a61062c21c