Heap 0.8.2
Merge pull request #10306 from matinm/master2

Heap 0.8.2