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