Re-synced with spark.html

TBR: @terrylucas