prepared 1.7.1
Merge branch 'master' into dev2