minor changes
Merge branch 'two-dot-o' of ssh://stash.safehaus.org:7999/chop/main into two-dot-o