merge2
Merge pull request #2 from gaaady/2-2-stable-merge

2 2 stable merge