python fixes
Merge branch 'master' of https://github.com/OsirisSPS/osiris-sps

Conflicts:
	client/src/core/buffer.cpp