Fix whitespace
Add enrichers
Cleanup
Merge branch '3.7'
Cleanup
Ignore .ant_targets
Refactor build script