Merge from master changes that close br tag.