Merge commit 'aace8b184c867875e2715b2af23fa98886f90427' into release/0.10
* commit 'aace8b184c867875e2715b2af23fa98886f90427': Prepare for 0.8.17 Release Conflicts: RELEASE not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: