re-add stuff from wrong merge
re-add stuff from wrong merge

njam/CM,vogdb/cm,tomaszdurka/CM,cargomedia/CM,fvovan/CM,vogdb/cm,vogdb/cm,christopheschwyzer/CM,vogdb/cm,tomaszdurka/CM,fauvel/CM,mariansollmann/CM,mariansollmann/CM,zazabe/cm,cargomedia/CM,njam/CM,christopheschwyzer/CM,alexispeter/CM,njam/CM,vogdb/cm,fvovan/CM,njam/CM,fvovan/CM,zazabe/cm,cargomedia/CM,cargomedia/CM,njam/CM,tomaszdurka/CM,fauvel/CM,alexispeter/CM,alexispeter/CM,christopheschwyzer/CM,mariansollmann/CM,fvovan/CM,alexispeter/CM,zazabe/cm,tomaszdurka/CM,fauvel/CM,zazabe/cm,fauvel/CM,fauvel/CM,tomaszdurka/CM,mariansollmann/CM,christopheschwyzer/CM