Merged revision(s) 3-5 from branches/tr-1.x:
Second commit

........
branch
........
commit to tr 1.x
........