ticket:000 fixed tests after V1.0.1-branch merge
Merge branch 't000_merge_v1.0.1_branch_20130710'