Release 1.7.0b2
Merge branch '1.7'