Merge github.com:LibertyEiffel/Liberty
Merge branch 'master' of github.com:tybor/Liberty