clean svn11511
added changes from current master manually
bla