Merge 0.7->trunk