Fixes for code reviev
added comment
Fixes
Merge pull request #112 from jbzdak/merge_base_role

Update of base.Role + tests
New version that is somewhat safer

Merge remote-tracking branch 'remotes/upstream/master' into merge_has_line

Conflicts:
	tests/unit/core/test_roles.py