use google master tools
Merge branch 'hotfix/issue_20130328_01'