typo fixed
Merge branch 'b7.0.1'