Merge branch 'master' into bug475101-rra