Merge remote-tracking branch 'apache/master'

Conflicts:
	python/pyspark/rdd.py