Backport #2251 into 3-1-stable #2257

Merged
merged 1 commit into from Jul 25, 2011