merge from SparkR master