Merge previous particle improvements from trunk of which the last commit was dependant on
Authored by: klaussfreire 2013-03-25
Parent: [r13599]
Child: [r13601]