r410: merge tpot's changeset 353 from trunk: