Import 1.7 snapshot
Merge pull request #2 from fb08af68/master

Import 1.7 snapshot