Merging trunk changes from 3.4.1 (8798-8829)
Authored by: barmintor 2010-11-09
Parent: [r8829]
Child: [r8831]