Merge tag '1.7.1'
Merge branch 'master' into 1.8