Manually merge r83995: Fix version{added,changed} and spacing in NEWS