Merge branch 'master' into newabi

No functionality change, some of the fixes from this branch have been
back-ported to master and this merge is just to fix up the history.
main
David Chisnall 8 years ago
commit 24984bffc5

Diff Content Not Available