Re-do the cutting off of trailing “<br>”s.
Merge remote-tracking branch 'ospalh/develop-ospalh-special' into develop-ospalh-special