Merging request #54.
Merging request #54.

d-tk/dtk,rdebroiz/dtk,rdebroiz/dtk,d-tk/dtk,NicolasSchnitzler/dtk,rdebroiz/dtk,d-tk/dtk,d-tk/dtk,NicolasSchnitzler/dtk,d-tk/dtk,NicolasSchnitzler/dtk,d-tk/dtk,NicolasSchnitzler/dtk,rdebroiz/dtk