Merge branch 'linhua55-master'