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