MEH now runs on Java 6 properly.
Merge remote-tracking branch 'upstream/master'