increment version to 4.0-SNAPSHOT
increment version to 4.0-banana-SNAPSHOT
be more consistent for the upgraded compiler
merge release 4.0 to master