Merged trunk into my branch. Making everything clean for new round of changes.
Authored by: pheonixstorm 2011-12-02
Parent: [r13254]
Child: [r13256]