Switching from density to count by default.
Merge remote-tracking branch 'origin/master'