n7.2-dev

Michael Niedermayer

Main development, master branch after release/7.1 branched off