Update version to 0.7-trunk and sync CHANGES for #2