Merged in 2.1-stable changes.