notes for merging the upstream branch (main development of j2objc)