Merge pull request #31 from shykes/shykes-0.6.5-dm-plugin

Merge from dotcloud/docker master