Merge proposals

=puppetmaster= has no merge proposals.