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

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