Issue #281:

backport fixes from PR #257, Issue #227 and Issue #226
Pharo3.0 not supported at this point [ci skip]
Merge branch 'issue_281'

Conflicts:
	.travis.yml
	repository/BaselineOfMetacello.package/BaselineOfMetacello.class/instance/baseline..st