Merge proposals dependent on lp://staging/~jpds/launchpad/fix_361650_model_changes

lp://staging/~jpds/launchpad/fix_361650_model_changes has no merge proposals.