fixed formatting - no functional change
fixed formatting issues - no functional change
Merge branch '13.09'