Merge proposals dependent on lp://qastaging/~nipy-developers/nipy/trunk-upgraded

lp://qastaging/~nipy-developers/nipy/trunk-upgraded has no merge proposals.