Update FaureG/O7/apres to 2.18.
Merge branch 'Faure' of https://github.com/pacovila/The-Mutopia-Project
Header tweaks