Merge branch 'privat' into contrib-pep8analysis