Spark 2.0 does not support None value in Row

gistfile1.txt

import org.apache.spark.sql._
import org.apache.spark.sql.types._

val sqlContext = new SQLContext(sc)

val schema = StructType(List(
      StructField(name = "surrogate_key", dataType = LongType),
      StructField(name = "family", dataType = StringType),
      StructField(name = "time", dataType = LongType),
      StructField(name = "user_id", dataType = StringType),
      StructField(name = "temperature_k", dataType = DoubleType)))

// Works fine with null value in Row
val rowWithNull = sc.makeRDD(Seq(Row(2L, null, 111222L, "test", 123.123)))
val dfWithNull = sqlContext.createDataFrame(rowWithNull, schema)
dfWithNull.collect()

// Fails with None value in Row
val rowWithNone = sc.makeRDD(Seq(Row(2L, None, 111222L, "test", 123.123)))
val dfWithNone = sqlContext.createDataFrame(rowWithNone, schema)
dfWithNone.collect()