merging r18505 and r18506 into release
Authored by: mrieser 2012-02-23
Parent: [r18521]
Child: [r18523]