Merge with old branches, and start 1.8-Snapshot integration