Merge pull request #780 from cybermaster/master

SPARK-850