Merged from upstream (the EPOC32 port was added)