Merge "Refresh language re experimental branch; remove trailing whitespace."