finished merging all 1.1.x (d4fbe7a1b7c0f81f2252c8f1b62afa567ffd7140)  to trunk