update to 0.71
Merge branch 'upstream'
update to 0.71