indent + remove trailing spaces, no functional change
Merge remote-tracking branch 'origin/13.09'