Merge branch 'release/20130211'
fix tests
Merge branch 'hotfix/20130211_1' into develop