Merge remote-tracking branch 'agraf/s390-for-upstream-1.1' into HEAD