Conflicts:
	sbws/lib/v3bwfile.py
	tests/unit/lib/test_v3bwfile.py