Merge "more diagnostics, and switch to downloading vsg-1.1"