Merge branch 'ricardo'
Merge branch 'master' into ricardo