Merge D3.js branch