Synchronize with trunk up to r125276
Merge branch 'master' into spring-32

Synchronize spring-32 branch to trunk r125276
Fix RSF version regression in Mail Sender