Merge branch 'master' into portable-errors