merging r18461 and r18479 into release
Authored by: mrieser 2012-02-23
Parent: [r18524]
Child: [r18526]