r2882 - pull changeset:2881 into trunk