ks-ci-bot Merge pull request #304 from renyunkang/master