Merge branch 'develop' into no-redis

Conflicts:
	sources/pyperfstore2/pyperfstore2/manager.py
	sources/pyperfstore2/pyperfstore2/store.py