r2961 - maintenance->trunk sync of changeset:2940