Update master from Hadoop Code 11.01.2014