Version, changelog
Merge commit 'b80cab91529f851a9678672cb78c0431f502529d'