use delegation, not inheritance
there was some funky hiding going on and leading to a crash. More info in next commit message.
Authored by: thibautd 2014-04-08
Parent: [r28592]
Child: [r28594]
