This depends on PR#196, please review that one before this one :).
Looks good for me.
rebased onto 3802fb21445dc3432ab795a5b438b27658bd0b3b
Pull-Request has been merged by jkaluza
This depends on PR#196, please review that one before this one :).