Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-pullreq-20180905'...