Merge proposals dependent on lp://staging/~stoq-dev/stoqlib/master

lp://staging/~stoq-dev/stoqlib/master has no merge proposals.