Merge pull request #1464 from akoeplinger/fix-portable-target