added sniffer for Java 6 compat
Merge origin/master