r960: merge changes from the master branch
Merge branch 'dev'