Merge remote-tracking branch 'remotes/xtensa/tags/20181030-xtensa' into staging