Merge "Don't send bare line feeds to EAS 2.5"