Merge branch 'portable' into macosx