Merge branch 'master' into drzb2011.3