Merge "Support align attribute for paragraph tag in markup" into devel/master