Merge remote-tracking branch 'remotes/rth/tags/pull-target-i386-20150915' into staging