Merge with master to pick up gitk --parents changes.