Merge fixes in Trunk.

svn path=/branches/release/tools/auto_index/; revision=83956