ce76b6a499
Conflicts: notes/release-notes.all.html.in notes/release-notes.ru.html.in
Conflicts: notes/release-notes.all.html.in notes/release-notes.ru.html.in