Merge branch 'master' into trunk
Merge branch 'trunk'