Merge proposals dependent on lp:~vauxoo/edima/edima-edima_fix_data-dev-yani

lp:~vauxoo/edima/edima-edima_fix_data-dev-yani has no merge proposals.