Main development, master branch after release/2.0 branched off
Update back for git master

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2 files changed