Merge proposals

bootchart-collector has no merge proposals.