Merge branch 'master' into wpo-trunk