merge
fix for hadoop 0.20.2, etc