Bumped v
Merge branch 'master' into dev

Conflicts:
	src/client/utilities.py