Commit 34394e7ee024d2b88bed9c61b9a19bba6ec5e49e

bobsayshilol 2018-11-07T23:45:17

Misc fixes to bring portable in line with upstream.