Merge proposals dependent on lp://qastaging/~villemvainio/ipython/trunk-dev

lp://qastaging/~villemvainio/ipython/trunk-dev has no merge proposals.