meld merge Mani changes into my branch
Merge pull request #101 from AdoptOpenJDK/merge_mani_changes

meld merge Mani changes into my branch