cosmetic changes - nfc (no functional changes)
Merge remote-tracking branch 'origin/13.09' into issue357
indent + trailing spaces - nfc
Merge remote-tracking branch 'origin/13.09' into issue357