Apply @akidata's fix re #965 + changelog