cosmetic changes - nfc (no functional changes)
Merge remote-tracking branch 'origin/13.09'