marge from liuxin 2017-4-11 CoderXLoong#4

CoderXLoong merged 1 commit intoCoderXLoong:masterCoderXLoong/coding2017:masterfrom

onlyliuxin:masteronlyliuxin/coding2017:masterCopy head branch name to clipboard