Sync with dc.js master - further work