Merge "Support paragraph tag <p> in markup" into devel/master