Updated to trunk with latest changes.