merge stable
merge stable

junghans/csg,MrTheodor/csg,junghans/csg,MrTheodor/csg,votca/csg,votca/csg,junghans/csg,MrTheodor/csg,MrTheodor/csg,junghans/csg,votca/csg,votca/csg,junghans/csg,MrTheodor/csg,junghans/csg