Merge branch 'master' into ra.to.merge