Update to trunk from mike's branch.