Merge proposals

Markus Koschany has no merge proposals.