Bug fix: thread safing of the aspect handling
Authored by: ozzy-ext 2013-12-21
Parent: [r950]
Child: [r952]