handle the case where block->domain is NULL in comparaison function
Merge branch 'master' into portable