Fixed #2391
Reverted an unwanted formatting change
Merge remote-tracking branch 'upstream/master'