Fixed min and max modes of histogram
Merge remote branch 'upstream/master'