Re-synced with spark.html #2

TBR: @terrylucas