Applied changeset r3926 on release branch to trunk.