refixed style switch
Merge remote-tracking branch 'origin/1.4' into 1.4