Manifest files were made to be ignored.
Merge branches 'codehaus-elimination' and 'config-publicity'