Merge branch 'master' of http://earth.bsc.es/gitlab/es/diagonals

4 jobs for master
in 4 minutes, using 0 compute credits, and was queued for 5 seconds