Merge remote-tracking branch 'remotes/aurel/tags/pull-tcg-mips-s390-20150803' into...