Update to r4529
Merge branch 'master' into shipping