WIP: Docker 0.9.0 support

Oh dear.