Merge proposals dependent on lp:~peter-bienstman/mnemosyne-proj/trunk

lp:~peter-bienstman/mnemosyne-proj/trunk has no merge proposals.