Fixed #3390, single heatmap point getting huge size and causing rendering defects. Better axis metrics for single points. Closes #2515.
Merge remote-tracking branch 'upstream/master'