Merge remote-tracking branch 'origin/master' into benc-remove-channels

 Conflicts:
	parsl/channels/local/local.py
	parsl/dataflow/dflow.py