Merge branch 'refs/heads/add-compact-attributes' into develop

Conflicts:
	setup.py