Merge remote-tracking branch 'upstream/master' into add-spark-tree-view
Merge remote-tracking branch 'upstream/master' into add-spark-tree-view
spark_tree_view: some reshuffling and cleanuing up
Merge pull request #1745 from ussuri/add-spark-tree-view

spark_tree_view: some reshuffling + cleanups