README
Merge branch 'master' into ubuntu-i386