Merge proposals dependent on lp://qastaging/~funrun73/calibre/calibre-dev

lp://qastaging/~funrun73/calibre/calibre-dev has no merge proposals.