Fixed issue #259 .
Merge branch '4.3' into rc
Merge branch 'rc'