Readying 1.7 release
Merged in 1.7