Merge proposals

Michael Niedermayer has no merge proposals.