Heap 0.12.0
Merge pull request #10797 from matinm/master2

Heap 0.12.0