Merge proposals

meta-phosh in Ubuntu has no merge proposals.