Fixed sorting issue in heatmap
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into kareem-dev

* develop:
  Fix typo.
  Updated to reflect changes in 1.3
  Updated to reflect changes in 1.3
  Updated to reflect changes in 1.3
  Updated to reflect changes in 1.3
  Updated to reflect changes in 1.3
  Updated to reflect changes in 1.3
  Updated to reflect changes in 1.3