amplitude histogram prune
beginning to use c-style quoting
Merge remote-tracking branch 'origin/0.4-dev' into 0.4-dev