Merged most current woglinde/meta-java