Merging a D3 working branch into master