Merge branch 'master' into steven/hdfs