patch to version 0.7.1

Change-Id: I7add8288f84d6fa3a320208b0490999fc4f3090e
Merge branch 'release'

Change-Id: I7bd43f1f09b07605c5ce9f5800ce9469f177622f
Merge branch 'master' into next

Change-Id: Ib7108a87971ddca2a2fa77502c1169c399e9c9ca