Merge pull request #52 from estebanlm/master

merge with Eliot's
Merge pull request #53 from estebanlm/master

update cairo
Merge branch 'master' of github.com:pharo-project/pharo-vm