Merge branch 'master' of github.com:apache/spark into collect

Conflicts:
	core/src/main/scala/org/apache/spark/util/Utils.scala