Merge branch 'master' into bug620870-rra