Clang nos-v-merge branch has been merged into master. Reviewed-By: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>