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

Conflicts:
	mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala