Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170608' into staging