Merge branch 'master' into packaging

Conflicts:
	pithos/__init__.py

diff --cc snf-pithos-app/pithos/api/functions.py
Simple merge

diff --cc snf-pithos-app/pithos/api/util.py
Simple merge

diff --cc snf-pithos-lib/pithos/lib/client.py
Simple merge

diff --cc snf-pithos-lib/pithos/lib/transfer.py
Simple merge