Merge pull request #790 from nico/relnotes2