Trying to resolve the docking deps.
Merge pull request #56 from gestom/master

Trying to resolve the docking deps.