Merge remote-tracking branch 'remotes/rth/tags/pull-tgt-i386-20140512' into staging