Merge indentation fix from 3.3.