Readying for 1.8
Merged from 1.8 master