Update changelog
Merge pull request #3142 from mmoya/devel

Update changelog