Changes 6.2 to 6-2

王权利请求将github/fork/spuder/patch-7合并到master

Created by: spuder

Fixes Issue #5667 (closed)

合并请求报告