n7.1-dev

Michael Niedermayer

Main development, master branch after release/7.0 branched off