previous commit was not right, fix for real this time
Merge branch 'master' into portable