Nux

Merge proposals dependent on lp://qastaging/~gordallott/nux/nux-fixes-05-04

lp://qastaging/~gordallott/nux/nux-fixes-05-04 has no merge proposals.