Another one bite to dust...
Merge branch 'hotfix/heatmap_results_5'