Update 1.7 branch to 1.7.11.  Add 1.8 branch, to 1.8.1.