Merge proposals dependent on lp:~mhr3/libzeitgeist/various-fixes

lp:~mhr3/libzeitgeist/various-fixes has no merge proposals.