merged d3 commit 2697a60ba0