Merge commit '473281193bed8dcb3f6954a18d03cf6298d651b3' into release/1.1
* commit '473281193bed8dcb3f6954a18d03cf6298d651b3': Update Changelog for v9.18 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: