merge 1.5.4.3

git-svn-id: http://xe-core.googlecode.com/svn/trunk@12980 201d5d3c-b55e-5fd7-737f-ddc643e51545