Pull request #1487: 无JIRA任务 bugfix
Pull request #1487: 无JIRA任务 bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'cb828e51511bfd6e85c47a866d47220cea0c1c55':
  bugfix
  bugfix

fanruan/fineui,fanruan/fineui,fanruan/fineui,fanruan/fineui