Merge with master to pick up gitk updates.