Merge branch 'master' into rave2