Cherry-pick release-0.4 -> master

* Add heat patches and short README on how to apply them.
  Ia1a63cf7ed520e43bb6cd7d9f9e5abb747b484e9
* Fix error in README.rst
  Ic26c61d763f69f2e2d9ea23a048230b8ec7abd75

Change-Id: I834da6ece3cdfc312312f58c12b242030711b208