merge from 3.2.

Fix closes Issue1147.