Fixing a couple of changes I didn't intend to push
Merge branch 'd3test' into iss450