Merge with master for gitk and doc updates.