Merge "Add debugging to docker output"