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