Fixed border for rich text editor.
Merge remote-tracking branch 'origin'