Guava 14.0.1 changes
Merge remote-tracking branch 'origin/spork' into spork

Conflicts:
	pig-spark