Merge branch 'timeheap'