manually merged #93
manually merged #93
fixes HADOOP-110