Merge differences between 7.7.0 and 7.8.0
branches: 1.2.4;resolve conflicts, document HEAD vs release import process.
branches: 1.1.1;Initial revision