merged in trunk to get docs/manual updates