Forgot to update Changelog with the last fix
Merge branch 'master' into handy