Fix configure help for --disable-system-heap.
Git ignore autogenerated files.
Merge remote-tracking branch 'upstream/master'