Merge proposals dependent on lp:~ifolder-dev/simias/trunk

lp:~ifolder-dev/simias/trunk has no merge proposals.