Merge remote-tracking branch 'origin/master' into wr-on-ws