Bump version & update changelog
Merge remote-tracking branch 'upstream/master'
Bump once again

Mishap with hg/git mirroring