Merge remote-tracking branch 'remotes/ehabkost/tags/x86-for-3.1-pull-request' into...