Incorporated changes that were dropped in Lorenzo's integration.
Incorporated changes that were dropped in Lorenzo's integration.

chiguire/nttcitygenerator,chiguire/nttcitygenerator,chiguire/nttcitygenerator,chiguire/nttcitygenerator,chiguire/nttcitygenerator,chiguire/nttcitygenerator