Merge "Minor style fix."