indent + trailing spaces - nfc
Merge remote-tracking branch 'origin/13.09'