Another rewording.
Merge branch 'heap' into merge-heap