Prepare changelog for 0.61-2
Imported Upstream version 0.61
Imported Upstream version 0.61
Merge tag 'upstream/0.61'

Upstream version 0.61