Fix bug 9300. We need manually to convert newlines to paragraph breaks.
Merge remote-tracking branch 'github/build-bot-2.1.x' into bleeding-edge-2.1.x
2014.11.04-16.00