Starting release 1.6; rev develop branch to 1.7