Merge branch 'master' into newhead
chk