Merge of SVN 48902 to git
Force size of bins in histogram to unity unless number > 1000