Patch from #11485. SVN-Revision: 31847
Patch-by: Vince Huang <axishero@foxmail.com> SVN-Revision: 31608