formatting cleanup
conclude mergeracking branch 'upstream/master'