Heap 0.12.1
Merge pull request #10903 from matinm/master2

Heap 0.12.1